From 08ad0a2e22947518da335a564eb580970e581cb4 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 11 Oct 2005 01:19:09 +0000 Subject: [PATCH] KML: Use url_link_text to build a linky link when we can. --- gpsbabel/kml.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c index 6416ea6ad..55d7ddeb3 100644 --- a/gpsbabel/kml.c +++ b/gpsbabel/kml.c @@ -93,9 +93,6 @@ xg_tag_mapping kml_map[] = { { wpt_e, cb_end, "/Document/Folder/Placemark" }, { wpt_name, cb_cdata, "/Document/Folder/Placemark/name" }, { wpt_desc, cb_cdata, "/Document/Folder/Placemark/description" }, -// { wpt_type, cb_cdata, "/Folder/Placemark/type" }, -// { wpt_link_s, cb_start, "/Folder/Placemark/link" }, -// { wpt_link, cb_cdata, "/Folder/Placemark/link" }, { wpt_coord, cb_cdata, "/Document/Folder/Placemark/Point/coordinates" }, { NULL, 0, NULL } }; @@ -295,11 +292,16 @@ static void kml_waypt_pr(const waypoint *waypointp) // Description if (waypointp->url) { char * odesc = xml_entitize(waypointp->url); - fprintf(ofd, "\t "); - fputs("\n", ofd); - fputs(odesc, ofd); - xfree(odesc); + fprintf(ofd, "\t \n"); + if (waypointp->url_link_text) { + char *olink = xml_entitize(waypointp->url_link_text); + fprintf(ofd, "%s", odesc, olink); + xfree(olink); + } + else + fputs(odesc, ofd); fprintf(ofd, "\n\t\n"); + xfree(odesc); } // Location -- 2.30.2